merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 27 Sep 2011 03:21:54 +0000 (12:21 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 27 Sep 2011 03:21:54 +0000 (12:21 +0900)
commit1d36acf5a190fb70d4ea28fa1bb802938c4449c0
tree624d00d44e2374c6f6a0ccd7e47e1eeb57545d59
parente0ebf48332dcee7913d98e1ace38f9ceb5ea63f2
parent5670a9006d674e766c205bdb8d1c6588a2dd56eb
merge trunk